![]() ![]() But, conflicts aren’t necessarily scary.Git merge b2 # Lo and behold we get a conflict even though there no changes on the same lines So, checkout new branches like this:Ĭan we merge b2 into a13 without a conflict? git checkout a13 Now, we don’t want to modify these, but we want to see what we can merge with what else.After this it is easy to view all those branches in RStudio’s git History viewer.Then checkout each of those branches in turn and modify the file three-lines.R in them according to their names (add an a at the end of line 1 in a1, add an a at the end of lines 1 and 3 in a13, etc.), i.e. in a13 the file will look like: # Line 1 a # Line 2 # Line 3 a Immediately make some new branches: git branch a1 After committing you have a master branch. Create new RStudio project with a git repository and call it explore_conflictĬreate a new R file called three_lines.R and fill it with this: # Line 1 # Line 2 # Line 3.Same line? Same word? Same “paragraph”?, etc.What is meant by the same part of the same file. ![]() ![]()
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |