Alex Rivera | Logout

Questions tagged git-tower

1 question

Sort by: Newest Votes Active
12
votes
2
answers

In git merge conflicts, how do I keep the version that is being merged in?

git version-control git-tower
asked 2012-12-14T19:54:03.040