This is pretty basic, but the user interface does not make obvious what to do. I did not use SourceTree much.
There is only a "master" branch. A file has a conflict on a single line. Trying to do either a Pull or a Merge shows the file, with two versions of the line (with + and - signs). Now what? I want to tell SourceTree to just pull the updated file from the repository, but how can I do that?
SourceTree does not have a merge tool. You can use another merge tool like Meld and configure it to be used with SourceTree. You can do the same thing with command line.
Or you can open it in a simple text editor and resolve it yourself. In any case, merge resolution happens outside the Bitbucket Server.
Not sure how this got marked as "bitbucket-server", will try to ask again in the SourceTree topic.
In any case, I do not have a messed-up file, and selecting "reject hunks" (what does that really mean?), produces a .rej file with this content:
diff a/css/service.css b/css/service.css (rejected hunks)
@@ -1,6 +1,6 @@
- background-image: url(../image/texture.png);
+ background-image: url(../image/texture_simple.png);
background-size: 100% 100%;
Not too sure what "command line" you are talking about, I am a poor Windows 10 user, but would be completely OK running any command line to fix the problem, even under Cygwin. It is weird though, SourceTree is supposed to simplify and make visibile what I am doing, right?
Jobin, thanks for replying. I have resolved the issue. Summarizing for the benefit of anyone searching for how to handle this type of situation:
I think I have now succeeded in tagging this question as "sourcetree" instead of "bitbucket-server".
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG