In the meantime, I will read the link you sent me. git cherry-pick can be useful for undoing changes. Cherry picking is the act of picking a commit from a branch and applying it to another. Looking forward to hearing back from you. Tutorials Git Cherry Pick git cherry-pick is a powerful command that enables arbitrary Git commits to be picked by reference and appended to the current working HEAD. Git implements this squash by creating a new commit, whose parent is 'Xcode 10.2, Swift 5' and whose changes are equivalent to those of 'darn, property list encoding' and 'v1.1.1build24'. I know I did something wrong here, or, many things wrong here, thank you so much for your time and guidance in helping me understand this process. 'darn, property list encoding' and 'v1.1.1build24' are squashed as one commit. I then went into Jira and created a branch from the forms project and tried to check it out in sourcetree, but I wasn't sure where to check it out too as I was expecting to see the branch within the subtree, but alas it wasn't there. I can see it in the left nav area now >forms in the setup window, I selected the forms (git) repo url, 'Master' branch (Wasn't sure which to select), and the local file path > portal > forms. I was in the Portal project and right-clicked the left menu area and selected 'add link/subtree'. So I have, in SourceTree, a project for Portal and a project for Forms. So our file structure for development looks like this: > portal > forms > etc. So, our master project is, separate git repo, we also have another git repo. So sorry for the many, many questions to come. I am very new to git and my PM has asked me to lead this process and figuring out how it works.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |