atlassian-sourcetree

Git not able to recognise addition of .xcscheme files in xcode project

给你一囗甜甜゛ 提交于 2020-07-05 07:18:18
问题 Added a new scheme corresponding to a test target in my xcode project. The new xcscheme file created is not getting reflected in git. Also doing a git status shows me nothing to commit, working directory clean . Trying to add it through terminal by git add .xcscheme says The following paths are ignored by one of your .gitignore files: MyProject.xcodeproj/xcshareddata/xcschemes/MyProjectTests.xcscheme Use -f if you really want to add them On verifying my .gitignore file, its completely blank.

git unmerge a branch

青春壹個敷衍的年華 提交于 2020-06-29 07:31:35
问题 I am using sourceTree for Mac as my GUI so I would appreciate instructions on using it but obviously I would like to learn the bash commands as my first language. We have a remote repo we call develop , and the practice is, when you develop a feature, you create a branch from develop for that feature, for example feature1 , pull it down, and then submit a pull request on the branch you created. I have recently developed some analysis tools which I don't want to get put into the remote code