Overview of basic Git workflows
Content of page:
- Git status
- Merge local to remote
- Manually clone into a populated folder:
- Use git as a local file merge tool
cd ~/Documents/your-project/ git status
Merge local to remote:
- make a change in remote repo to file text.txt
- make a change in local repo to file text.txt
- add and commit your changes locally
- “git fetch origin master”
- OPTIONAL: “git log –oneline master..origin/master” (this shows the commits that the remote is ahead)
- “git merge master origin/master” (if there are conflicts the conflicting files will get text from both conflicting files)
- Keep all local file changes: “git checkout –ours *“ (you may replace the * char with a file or path)
- Keep all remote file changes: “git checkout –theirs *“ (you may replace the * char with a file or path)
- Then add, commit and push
- The commit history will now display remote commit, local commit, merge commit.
To manually clone into a populated folder
- git init
- add and commit your files
- attach remote origin
Then do the exact same steps as you do in the “Merge local to remote workflow”
Use git as a local file merge tool
Basically you are doing this: repoA -> repoX (remote) ->repoB
Pretext: I have a huge code lib that i recently updated alot of comments in from my ipad. Pre GitSync era. Now i want to merge back together with the lib on my macbok. I can create a private repo on bitbucket, but i dont quite trust bitbucket with this code lib. So why not do it locally? We are using Github desktop app for doing the merging because it has a pretty good visual code diff feature. We use terminal to setup the “faux remote git”
- You create 1 “bare repo” named “repoX” in terminal:
mkdir ~/Desktop/del/repo2.git cd ~/Desktop/del/repo2.git git --bare init
- then you create 2 repos from the github desktop app named: “repoA” and “repoB” (use the add button)
- you then click the repo properties for both repoA and repoB and set their remote to the path of repoX: “~/Desktop/del/repo2.git”
- Add a file in repoA and publish it with the github desktop app.
- in repoB click sync in the github desktop app. and you will now get the file originally from repoA
- Now the great thing about this is that you can add many files to repoA and then commit and sync from GitHub Desktop App and then in repoB you will get a nice visual feedback about the textual changes additions in green and subtractions of text as red.
- To avoid messing with checking out previouse commits if you dont like a change etc. I recomend just keeping a stash of the new and old code lib and then just copy paste in any file you didnt like. Basically copy the old one or the new one, which ever you liked the most. Very non-destructive. Merging rebasing, checking out etc is not easy and can very quickly go astray. And its cognativly tasking, when you should focus on getting the right changes etc.
Note: Actually you may only need RepoA and then a RepoB that you set as remote. when you feed in old code files into repoA and then commit to RepoB, and then just replace these files in repoA with the “new “ files, you will get a vidsual feedback of what has changed. This simplifyies things. the approch described above is still valid. just replace repoB with repoX and you are good.