#Pulling from remote

1 messages · Page 1 of 1 (latest)

summer mantle
#

when making rebase (or merge, I'm not sure) in IDEA by pulling from remote, can I do it 'commit by commit' instead of only solving conflicts?

indigo kettleBOT
#

<@&987246527741304832> please have a look, thanks.

indigo kettleBOT
#

While you are waiting for getting help, here are some tips to improve your experience:

Code is much easier to read if posted with syntax highlighting and proper formatting.

If nobody is calling back, that usually means that your question was not well asked and hence nobody feels confident enough answering. Try to use your time to elaborate, provide details, context, more code, examples and maybe some screenshots. With enough info, someone knows the answer for sure.

Don't forget to close your thread using the command </help-thread close:1027500463647621170> when your question has been answered, thanks.

#

Here is an AI assisted attempt to answer your question 🤖. Maybe it helps! In any case, a human is on the way 👍. To continue talking to the AI, you can use </chatgpt:1108714622413963314>.

#

Yes, in IntelliJ IDEA, you can perform a "commit by commit" rebase or merge instead of just solving conflicts. This allows you to review and modify each individual commit during the rebase/merge process.

To perform a commit-by-commit rebase or merge in IntelliJ IDEA, follow these steps:

  1. Open the Git tool window by navigating to View -> Tool Windows -> Git (or using the keyboard shortcut Alt + 9).
  2. Make sure you are on the "Log" tab in the Git tool window.
  3. Right-click on the commit that you want to start the rebase or merge from and select "Rebase..." or "Merge..." from the context menu.
  4. In the Rebase/Merge dialog, select the branch or commit you want to rebase/merge into.
  5. Check the box that says "Interactively rebase from here" (for rebase) or "Review changes before merge" (for merge).
  6. Click on the "Rebase"/"Merge" button to start the process.
#

Once you initiate an interactive rebase or merge, IntelliJ IDEA will open a new window showing each individual commit in chronological order. You can then go through each commit one by one, modify its content if needed, and choose whether to keep it, modify it, skip it, or squash it with other commits.

To modify a commit during an interactive rebase/merge:

  1. Double-click on a commit in the list to open its changes in the Diff Viewer.
  2. Make any necessary modifications to the code.
  3. Once you are satisfied with your changes, click on one of the buttons at the top of the Diff Viewer to choose how to handle this particular commit:
    • Keep: Keep this commit as is.
    • Edit: Modify this commit's content before applying it.
    • Skip: Skip this commit entirely and do not apply it.
    • Squash: Combine this commit with the previous one(s) into a single commit.
  4. Repeat these steps for each commit in the list until you have reviewed and modified all the necessary commits.

By following these steps, you can perform a "commit by commit" rebase or merge in IntelliJ IDEA, allowing you to review and modify each individual commit during the process.

crimson portal
#

@summer mantle can you reframe your question, I'm not sure if I understand this one.

summer mantle
# crimson portal <@400682489993232386> can you reframe your question, I'm not sure if I understan...

That's kinda stupid story. Have some lore.
I have cloned the repo, made some changes to it.
Then I pushed the changes. Decided to work on new feature and duplicated the project folder.
Worked there and pushed changes. Now I have an unsynced project and project with some changes.
Then I forgor about second's changes and continued to work with first.
Made so much progress and noticed: some commits are not exist locally.

When I press the pull button, it automatically merges commits (some of then are identical). And I have one merge problem which I am allowed to fix (that's okay). As a result, I lose some commits in the history (but the changes remain).

#

bruh

crimson portal
#

"rebase (or merge, im not sure)" , "commit by commit", idk which part makes sense. On being asked to reframe your question, you seem to be acting rude unnecessarily🙂

summer mantle
crimson portal
#

ah, words without context.

summer mantle
crimson portal
#

no worries

#

these two "features" on same branch?

#

Now I have an unsynced project and project with some changes

Couple of questions, your second "project" contains first iteration of changes?

#
  1. Then you didn't commit your "2nd project"'s changes and continued to work with first one?
summer mantle
#

1st is remote, 2nd is local
First have changes from 10 august. Second was not updated and I started to work there.

Now I know I had to make new branch and work there instead of duplicating folder

image.png image.png
crimson portal
#

oki, so a pull request shouldnt remove the local changes

summer mantle
#

After pulling, it shows me this notification.

image.png
#

And I can't review what was skipped, right?

#

I hope that was false alarm

crimson portal
#

I can't comment on that, please wait for someone who will be able to help with this. Altho is this a problem for you? If changes are already present then it means they will be skipped that's git being smart, are you concerned that you never pulled those changes?

summer mantle
crimson portal
#

Basically you look at the problem from different perspective, when you try to explain yourself.

#

Anyway no worries, feel free to hop in here for any discussion or help.

summer mantle
crimson portal
#

No need to be, as long as stuff breaks on your machine you're good.

summer mantle
#

Thank you