Repeated the previous committed changes

Hi,

I have committed my last changes and got the confirmation that my changes has committed. My last updates [pravinj committed Changeset 763dcca790b63f34b9447d0b5e9365bb0a56b0d8 updated style for the print invoice page. Branch:work ]

After that I got four more confirmations that committed changeset emails, but that was committed 2-3 days before and it overwrites my changes. Like -

pravinj committed Changeset c90c3824d77197766f16960c2816588365da3ce3
pravinj committed Changeset c6589392e8365ae95a3f0a4f045c944c7d521c36
pravinj committed Changeset 6913fa485faed55cb730e154589fb79bdeffd32f
pravinj committed Changeset 7e387631bb9cede06a1f6899ed522b6108a97975

At the time of committing the changes I push only two files, but it showing that I had committed all the previous changes.

you pushed local work branch to remote server, but you should use rake git:push to push changes.

Rake task will rebase your changes with master branch and will add commits to master, then it will push it to remote. Only master branch is showing to stage server www.assembla.cc

Thank you.

Now I have pushed local work branch – pravin_sep1 [Changeset af303edc0546161fe6c631e5bc9bf407c3fd8e02] and used rake git:push for the changes, but the same things happened that mention in previous posting, previous work branch has also pushed and showing the changes that was previously made.

you should remove remote branch with

git push origin :work

Now you need to reset work branch to master branch (make sure you have committed all local changes):

git-checkout work
git-reset --hard master

After you can commit to local branch work and pull/push changes with rakes tasks

rake git:pull
rake git:push