I am new to InteliJ + Bitbucket integration.
after clicking revert commit on specific commit I pushed before -
local file is changed to the way it looked before the commit
but
no files appears on the local changes window
while running git status command on the terminal getting:
You are currently reverting commit a3b1cd9.
(all conflicts fixed: run "git revert --continue")
(use "git revert --skip" to skip this patch)
(use "git revert --abort" to cancel the revert operation)
any idea if there is any way to progress with this situation via the Intelij UI to commit and push this reverting to bitbucket?
Solution was to click on push icon on top, and then popup with option to push the reverting commit is presented.
unlike regular commit that right after changing files all of them are ready to commit on local changes window, and push popup appears only after marking them and clicking commit button...
Related
WebStorm tries to push my project to an account that does not exist anymore. How do I change it? I have already added the new account to WebStorm and it still tries pushing to the old account.
You can change it in Settings>Repositories.
Setting>General>Repository name>rename
The entry highlighted on the screenshot is the commit author. This information is written in the commit, and is not related to the account that is used to push the change.
Author is determined by git configuration. You can check and change it using CLI - git config user.name and git config user.email
To change the author of the commit in question you need to re-do the commit.
Make sure git user is correctly set in git config, then undo the commit, and commit changes again.
To push, WebStorm will authenticate using the account configured in Settings | Version Control | GitHub, or according to the ssh config if ssh access is used.
I'm totally new with Mercurial.
When commiting and pushing my changes through IntelliJ Idea, I've accidently pushed the Commit and Create MQ patch button.
The commit went through, but push didn't. I force pushed my changes successfully (not a very good thing to do), but I cannot commit anything now.
I get this error:
1 file failed to commit: tip fix. abort: cannot commit over an applied mq patch
The fix was very simple:
I had to type these two commands in IntelliJ Idea terminal:
1. hg commit (with your message commit)
2. hg push
Now everything is back to normal.
First step, create a new project called "X2" by Xcode, and clicked
Source Control: Create git repository on My mac
Secondly, make a new git dir at another place for pushing by following command line
cd ~/documents/Temp
mkdir X2
cd X2
git init --bare .git
Thirdly, back to Xcode, add below under SourceControl > X2 > Configure X2 > Remote
~/documents/Temp/X2/.git
and then do some changes in the codes, then commit/push to X2/master(Create)
as of now, everything is ok, successfully.
Back to Github client, and ~/documents/Temp/X2 as a local repository, it already captured changes of push happened.
BUT, when click button of Commit & Sync, it said "no changes selected". click button "Edit" of push just happened, it shows:
Could not edit commit
Failed to reset repository to commit 1d42d81bc45dbec791f59a8c11ae719018c3469f.
Some screen shots for reference
Github client captured commit and push done in Xcode
The commit and push done in Xcode called "in"
click button Commit & Sync
click button Edit
So, my question is what happened on Github client? How to fix this problem?
If you do a rollback in Heroku it will checkout a previous commit on the Heroku side. We know that. However, how do you restore it to the HEAD commit?
It seems that you actually have to modify your local HEAD, and then push to the repository. Otherwise,
$ git push git#heroku.com:appname.git HEAD:master
Everything up-to-date
and nothing happens, i.e. no new release is created.
The easy solution is just to do some innocuous change like a bundle install, commit, and push. But I was hoping to find someway to bring apps up to the HEAD if they weren't before. Any insight? Am I missing something?
When you do a rollback, you're creating a new deployment to an older change #. The other version is still out there in git. So to go "forward" to the newer change, you'd roll back again, this time to the deployment at that hash number.
When I sync from the ToolTwist Designer, I select the files I wish to publish, but I get an error when I press OK, saying that the sync failed and to look in the server log file.
If I try again, the files I selected are no longer in the list, but if I check Git I can see they are not pushed to the repository.
In the log file I see that the push failed, and if I go to the webdesign directory and test the push command I get the same error:
$ git push --dry-run
To git#github.com:MyRepository/design-project.git
! [rejected] master -> master (non-fast-forward)
I'm using the 'design' branch, so I'm not sure why an error is occurring on the 'master' branch.
In normal circumstances the Designer only uses a single git branch, normally named 'design'. The error message above indicates a conflict on the master branch.
It appears that changes have been committed to the master branch on the local machine but not pushed, whilst elsewhere changes have been committed to the master branch and have been pushed onto the remote repo.
To clear this conflict you'll need to checkout the master branch and do a pull to merge in the changes on the remote, and then the next push will work. Don't forget to change back to the design branch when you're finished.
[stop the Designer]
$ git checkout master
$ git pull
[resolve any conflicts]
$ git push origin master
$ git checkout design
[start the Designer]
By default git tries to push commits on all branches. In this case, you might find that the conflict on the master branch is preventing your web design changes on the design branch from being committed. To prevent this from happening, you can configure git's default behaviour to only push the current branch.
$ git config push.default current
You might also want to investigate why the master branch is being changed (and in two locations).