python (65.1k questions)

javascript (44.2k questions)

reactjs (22.7k questions)

java (20.8k questions)

c# (17.4k questions)

html (16.3k questions)

r (13.7k questions)

android (12.9k questions)

Questions - pull-request

How can I resolve this yarn.lock conflict problem?

I've been developing next.js project using yarn and bitbucket. When I try to merge my branch to origin, but conflict problem is occurred. It is from yarn.lock file. There are many diffs between origin...
test-img

Kunkka Admiral

next.js

bitbucket

yarnpkg

pull-request

merge-conflict-resolution

Votes: 0

Answers: 1

Latest Answer

Did you install any new packages? Or update the ones that were being used? If so, you should merge and keep your changes. But if that's not the case, just discard your changes and keep the file as it ...
test-img

Gustavo Farias

Bitbucket automatic merge pull request from release branch

I have question. How do you deal with "Automatic merge" option from bitbucket. My problem: So bug detection on release/1.1 have pom version of release branch. If I create pull request to r...
test-img

Arczi

git

merge

bitbucket

pull-request

Votes: 0

Answers: 1

Latest Answer

If your automated merge would always (or oftentimes) result in a conflict, then I agree with you that the value is greatly lessened. However, I wouldn't go as far as saying it's "useless". W...
test-img

TTT

Merge a branch twice into another

I want to merge a branch twice to another branch. Let's say, I had a file in master branch. Contents of src/File.txt ABC I've created 'fix' branch from master and updated the src/File.txt to ABC - Fi...
test-img

Aneel Kumar

git

github

git-branch

pull-request

Votes: 0

Answers: 1

Latest Answer

As per your question, in step 2 you have merged (fix -> master) so all those commits from your fix branch would be moved to your master branch. Thus, later when you are trying to raise another PR ...
test-img

Subham Sarkar

Is there a way to auto add reviewers to a GitHub pull request I make

I know there is a way to set auto reviewers for a repository through settings but I am in an organization with many repositories and members and can't change those settings. My team specifically has 1...
test-img

Pranav Patel

github

automation

pull-request

Votes: 0

Answers: 1

Latest Answer

I have not tested it yet, but having the same problem and found this: https://github.com/marketplace/actions/auto-request-review. Depending on what you need, customize the workflow from its docs.
test-img

ShinaBR2

Posts

Questions

Blogs

Jobs