Hello. New member with first post here. For about a 2 years I've been using
a one-person git system (on Bitbucket). Nothing fancy. Mainly to maintain
an audit trail of changes to about half a dozen text files, and to make
sure I could always get the most current version when working at disparate
computers in different offices, on two different operating systems (Windows
10 and Linux Mint).
I am now in an awkward situation that may best be described
diagrammatically, below. Is there any good, git-centric way to get my
colleague's added lines (colleague's "file Q") into my main document
(called "file A" in master; called "file Z" in withindex)
Thank you.
master contains several files
| all in directory D1
|
|
|----------------------------------|
| |
V V
a series of edits gave copy of file A, but
and commits involving named as "file Q",
file A in D1. Pushed. to non-git-using |
colleague
| who added a number
| of lines, changed nothing else
| and sent it back to me
| I want those lines to be in |
file A
|
|---------------|
| |
| |
| V
| new branch called "withindex"
| created new subdirectory "D1A"
V git mv all project files into it.
A few deletions from file A.
Renamed file A to "file Z"
Committed, not pushed.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/b2347fba-cb23-4b79-bf89-a912f1541755n%40googlegroups.com.
