Forem: Md. Abdur rahman

Oops, I Committed to the Wrong Branch (And How to Fix It Fast)

Md. Abdur rahman — Tue, 21 Apr 2026 12:09:24 +0000

So, you just spent hours knocking out a fix. You committed the code, felt like a genius, and then realized your mistake: you did all that work directly on the dev branch instead of creating a feature branch first.

Don't panic. You don't need to manually copy-paste your changed files into a folder on your desktop. Git can fix this in seconds.

Here is exactly how to move your work over to a new branch (let's call it bugfix_order_module), whether you've kept those commits local or accidentally pushed them to the remote server.

Scenario A: You haven't pushed to remote yet
This is the easiest fix. Your commits are sitting on your local machine, and the remote dev branch is completely untouched.

Open your terminal (make sure you are on dev and have no uncommitted changes) and run this:

# 1. Create a new branch that copies your current state
git branch bugfix_order_module

# 2. Rewind your local dev branch back to match the remote server
git reset --hard origin/dev

# 3. Switch over to your new, safe branch
git switch bugfix_order_module

Why it works: You basically stamped a bookmark (bugfix_order_module) on your newest code, then forced your dev branch to rewind back to the state of the server. Your code is safe, and dev is clean.

**Scenario B: You already pushed to the remote server
**Okay, so you ran git push, and now those commits are officially on the remote dev branch.

Disclaimer: If you work on a team and other people are actively pulling from dev, ask your lead before doing this! Force-pushing can mess up your coworkers' local branches. If you are clear to proceed, here is how you rewrite history:

# 1. Save your work by creating the new branch
git branch bugfix_order_module

# 2. Rewind local dev branch by exactly 4 commits (change the 4 to however many you made)
git reset --hard HEAD~4

# 3. Force push this clean state to the remote server 
git push --force origin dev

# 4. Switch to your new branch
git switch bugfix_order_module

# 5. Push your new branch to the server normally
git push -u origin bugfix_order_module

Why it works: You saved your work locally just like before. But instead of matching a clean remote, you manually wound your local dev branch back by 4 commits (HEAD~4). Then, the --force flag told the remote server, "Hey, overwrite your history with my new, clean history." Run a quick git log and you'll see your code exactly where it belongs. Back to work!

Render Wasabi Cloud File

Md. Abdur rahman — Sun, 21 May 2023 13:40:00 +0000

Wasabi is a cloud object storage that is compatible with Amazon S3. It can be integrated with AWS, Google Cloud or Microsoft Azure solutions, using the same protocol and tools. Wasabi is a value-oriented, high-performance, low-latency, and high-availability cloud object storage offering.

Generating a pre-signed S3 URL for uploading an object in your application code with AWS SDK for PHP (V2)

You can make a helper function like this inside app/Helpers/funtions.php.

if (!function_exists('renderWasabiCloudFile')) {
    function renderWasabiCloudFile($fileLocationInsideYourBucket)
    {
        $s3 = new \Aws\S3\S3Client([
            'endpoint' => config('filesystems.disks.wasabi.endpoint'),
            'region' => config('filesystems.disks.wasabi.region'),
            'version' => 'latest',
            'credentials' => array(
                'key' => config('filesystems.disks.wasabi.key'),
                'secret' => config('filesystems.disks.wasabi.secret'),
            )
        ]);

        $cmd = $s3->getCommand('GetObject', [
            'Bucket' => config('filesystems.disks.wasabi.bucket'),
            'Key' => $fileLocationInsideYourBucket, //hYTYRT56.jpg
            'ACL' => 'public-read',
        ]);

        $request = $s3->createPresignedRequest($cmd, '+20 minutes');

        $fileUrl = (string)$request->getUri();

        return $fileUrl;
    }
}

Now, call the function and pass $fileUrl from your db.

<img class="img-fluid" src={{renderWasabiCloudFile($fileUrl)}}> //this url would come from your database (file path url)

You can also follow up the official guidance Generate pre-signed urls to learn more.

Wasabi Cloud Storage with Laravel 9

Md. Abdur rahman — Sun, 21 May 2023 13:01:00 +0000

Step - 1: Set up your laravel app enviroment (.env file) with your wasabi credentials like this.



WAS_ACCESS_KEY_ID=4I349UKY85N1FR3D4BBW2
WAS_SECRET_ACCESS_KEY=Z1FOT1cWCuH7zDtEMv6pGZ9SmA2yspno7G
WAS_DEFAULT_REGION=ap-northeast-1
WAS_BUCKET=mybucket
WAS_URL=https://s3.ap-northeast-1.wasabisys.com

Step - 2: The S3 driver configuration information is located in your config/filesystems.php configuration file. This file contains an example configuration array for an S3 driver. You are free to modify this array with your own S3 configuration and credentials.

So, add your wasabi driver configuration information to config/filesystems.php



<?php

return [

    'default' => env('FILESYSTEM_DRIVER', 'local'),

    'cloud' => env('FILESYSTEM_CLOUD', 's3'),

    'disks' => [

        'local' => [
            'driver' => 'local',
            'root' => storage_path('app'),
        ],

        'public' => [
            'driver' => 'local',
            'root' => storage_path('app/public'),
            'url' => env('APP_URL').'/storage',
            'visibility' => 'public',
        ],


        'wasabi' => [
            'driver' => 's3',
            'key' => env('WAS_ACCESS_KEY_ID'),
            'secret' => env('WAS_SECRET_ACCESS_KEY'),
            'region' => env('WAS_DEFAULT_REGION'),
            'bucket' => env('WAS_BUCKET'),
            'endpoint' => 'https://s3.wasabisys.com'
        ],

    ],

];

Step - 3: Before using the S3 driver, you will need to install the Flysystem S3 package via the Composer package manager:



composer require league/flysystem-aws-s3-v3

Remember to give permission at your bucket access control.
'object write and read access' should have to enable before upload any file. like this -

Step - 4: Finally, you can upload your media file to your bucket of wasabi cloud storage using this -



\Illuminate\Support\Facades\Storage::disk('wasabi')>put($file, $fileContents, 'public');

check if file not exist and upload at your bucket-



if (!\Illuminate\Support\Facades\Storage::disk('wasabi')->exists($fileLocationInsideYourBucket)) {
    \Illuminate\Support\Facades\Storage::disk('wasabi')->put($file, $fileContents, 'public');
 }

You can also follow up the official guidance Wasabi Laravel to learn more.

Create Wasabi Bucket and Pocilies

Md. Abdur rahman — Sun, 21 May 2023 12:51:00 +0000

Step - 1: First you have to set up wasabi account and create bucket. Get started with Wasabi?. or follow below steps.

Step - 2: Create IAM user.

select username and type of access

with appropriate permissions attached to the user for performing required action(s)

Step - 3: Then you need to generate bucket policy from [AWS Policy Generator.](https://awspolicygen.s3.amazonaws.com/policygen.html)

select actions and add statement of aws policy generator

You'll get this statement list.

Now, add one more statement and generate policy.

Step - 4: Save Policies of your bucket settings.

console will automatically show success message of your policy then save it.