Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

find and open conflict files from root git directory #27

Merged
merged 1 commit into from
Mar 11, 2018
Merged

find and open conflict files from root git directory #27

merged 1 commit into from
Mar 11, 2018

Conversation

olshevskiy87
Copy link
Contributor

fac could not open file with conflict if the user's current working directory differs from the git root directory. in this case fac writes something like "2018/01/28 22:12:43 open <...>: no such file or directory".

how to reproduce:

  • say we have git repo /git/myrepo/ with subdir lib/ as a current working directory
  • we also have file with conflict: /git/myrepo/main.go
  • run fac
  • the output will be "<...> open /git/myrepo/lib/main.go: no such file or directory"

@mkchoi212 mkchoi212 merged commit fb868ea into mkchoi212:master Mar 11, 2018
@olshevskiy87 olshevskiy87 deleted the t1 branch July 3, 2018 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants