git

问题 Using Terraform modules with a git branch as a source, I am referring to: git::ssh://private_server:myport/kbf/my_repository.git//ecs-cluster?ref=v0.0.1 In my module source parameter, this works great and provides me with my module at tag v0.0.1 on master. However I'd like to specify a branch, not a tag, but am not sure how to do this. 回答1: As mentioned in the Terraform documentation here: git::ssh://private_server:myport/kbf/my_repository.git//ecs-cluster?ref=myBranch 回答2: Exactly the same

问题 Q1: How can I reproduce this scenario? (I unsuccessfully tried to reproduce it) Q2: What does this Unmerged paths:... both modified:... state mean? I did a git stash (push) and got into an Unmerged paths: ... both modified: ... state, and I don't know why / what it means. My steps: modified a single file (I may have done a git add -p , and then might have modified the working tree copy (I don't remember)) $ git stash -m 'my message' $ git status Unmerged paths: (use "git restore --staged

问题 Alright I was inattentive when I was merging some code into a repository(There were major changes in the flow of some code), so I had to revert the merge commit. I went home for the day, and now there are more commits on master, and I can't seem to trigger a merge such that I can get my code into master, as in I have the diffs between the 2 files. I was clumsy and pushed to code to origin already. Here's the one line graph history of the most recent commits: How do I get back a proper merge

问题 Alright I was inattentive when I was merging some code into a repository(There were major changes in the flow of some code), so I had to revert the merge commit. I went home for the day, and now there are more commits on master, and I can't seem to trigger a merge such that I can get my code into master, as in I have the diffs between the 2 files. I was clumsy and pushed to code to origin already. Here's the one line graph history of the most recent commits: How do I get back a proper merge

问题 Alright I was inattentive when I was merging some code into a repository(There were major changes in the flow of some code), so I had to revert the merge commit. I went home for the day, and now there are more commits on master, and I can't seem to trigger a merge such that I can get my code into master, as in I have the diffs between the 2 files. I was clumsy and pushed to code to origin already. Here's the one line graph history of the most recent commits: How do I get back a proper merge

问题 Here are two commands with result examples: $ git show commit 6f367e05cc6457fd0c0fc59fe0476db06cffb383 (HEAD -> master, tag: v7.32, origin/master, origin/HEAD) Merge: 94ecf1d8 f3ea52b0 Author: Pupkin <pupkin@server.com> Date: Fri Dec 13 12:49:12 2019 +0700 Some commit description. $ echo `git show` commit 6f367e05cc6457fd0c0fc59fe0476db06cffb383 Merge: 94ecf1d8 f3ea52b0 Author: Pupkin <pupkin@server.com> Date: Fri Dec 13 12:49:12 2019 +0700 Some commit description. The important difference:

问题 I'm new to Sourcetree and have created a mess locally, with 7 ahead commits compared to the origin/master. I want to ignore and remove everything I've done locally and start again by reverting my local repo to the origin/master as it currently stands. How do I do this? Remark : I know the origin/master is correct since I have another machine next to me which I don't use to do commits and just did a pull from the origin/master, and the local repo is correct on this other machine. 回答1: You can

问题 Here are two commands with result examples: $ git show commit 6f367e05cc6457fd0c0fc59fe0476db06cffb383 (HEAD -> master, tag: v7.32, origin/master, origin/HEAD) Merge: 94ecf1d8 f3ea52b0 Author: Pupkin <pupkin@server.com> Date: Fri Dec 13 12:49:12 2019 +0700 Some commit description. $ echo `git show` commit 6f367e05cc6457fd0c0fc59fe0476db06cffb383 Merge: 94ecf1d8 f3ea52b0 Author: Pupkin <pupkin@server.com> Date: Fri Dec 13 12:49:12 2019 +0700 Some commit description. The important difference:

问题 I'm new to Sourcetree and have created a mess locally, with 7 ahead commits compared to the origin/master. I want to ignore and remove everything I've done locally and start again by reverting my local repo to the origin/master as it currently stands. How do I do this? Remark : I know the origin/master is correct since I have another machine next to me which I don't use to do commits and just did a pull from the origin/master, and the local repo is correct on this other machine. 回答1: You can

问题 I'm new to Sourcetree and have created a mess locally, with 7 ahead commits compared to the origin/master. I want to ignore and remove everything I've done locally and start again by reverting my local repo to the origin/master as it currently stands. How do I do this? Remark : I know the origin/master is correct since I have another machine next to me which I don't use to do commits and just did a pull from the origin/master, and the local repo is correct on this other machine. 回答1: You can