loxal DEV
...technologies to release ideas. —
@Twitter
2014-03-06
Mark conflicting files as resolved in Git
After you've manually resolved a Git merge conflict, you have to mark the resulting file as "resolved" (notion from other DVCSs). Just do this to achieve this:
git add
your_file_with_manually_resolved_conflicts.txt
No comments:
Post a Comment
Newer Post
Older Post
Home
Subscribe to:
Post Comments (Atom)
No comments:
Post a Comment