a) Removing multiple files from a Git repo that have already been deleted from disk: git rm $(git ls-files – -deleted)

b) Copy & paste in git bash on windows:

Copy: click the console’s window icon (top left) and choosing Edit -> Mark, then drag a box on the text, then press Enter.

Paste: press Insert.

c) Merge dev to br:

git checkout dev

git pull

git checkout br

(if there’re conflicts here, open the files that have conflicts and resolve the conflicts manually)

(checkout the project file if it’s not there: git checkout dev — *.xcodeproj/project.pbxproj)

(now compile it until it passes)

(commit the changes and push them, if any)

 d) execute shell file:chmod 755 shellfilename.sh

Advertisements