Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

1
  • Merge is of changes since a shared base -- and the file configA on the BranchA tip hasn't been changed since the base that tip shares with Master's tip. As Vampire points out, you just want that particular version, and the command you want is git checkout. Commented Oct 15, 2016 at 1:35